Made some public attributes 

Reduced the need for getters and setters