Cleaned up both classes

Added some comments and cleaned up some sloppy code