Formatting, remove a super()

I ran a full clean up on this with Eclipse, so there should be lots of fixes.

I didn't have the dependencies, so it's possible Eclipse screwed something up. You'll want to test this before merging with master.