Removed public attributes, converted to private attributes.
Added some getters and setters