Cleaned up the new classes

Simplified things, added comments, closed FileInputStream