Minor changes

Removed comments and changed encapsulation.