fixing accessors, removing commented code