Code cleanup. DO NOT MERGE

Currently experimenting with IDEA's code inspection feature.

Known bugs:
-Level may not be saved correctly (causing Sand to throw NPE when trying to fall, etc)