Cleanup

Removed a lot of unneeded code (Greenfoot's comments) and made some
cleaner