Added a comment
Make some variables private
Make some classes immutable