Implemented properties, removed instance variables