Code cleanup
Format ALL the code!
Fix blocks not clearing correctly. Fixes #116
This should fix stuff