Fix comment
Make stuff private and use getters/setters