Added some private modifiers and deleted some setters