Correct formatting/indentation.
Add missing @Override.
Remove commented out code.
Merge pull request #19 from Clockwork-Muse/formatting

Formatting