Just some cleanup (fixing formatting, killing unused imports, etc)