Comment and spacing formatting
Removed unnecessary imports
Fixed ordering of modifiers
Stopped overriding method that simply called the parent method
Moved else and catch to same line as closing brace, and fixed whitespace formatting
Using HashMap instead of LinekdHashMap on left side of declarations
Merge pull request #1031 from rackerlabs/EricSonarAndFormatting

Reducing Sonar Violations and improving Formatting