getters and setters added

+ code formating