#2 Removed comments on getter/setter methods, formatted classes