final comments, and removed uneeded getters and setters