Simplified some code + fixed set/get usage (should be 'get' here).