Magic number -> constant
Use final variables where possible
Suppress analyzer warning re: deprecated
Nuke unusued/redundant imports
Foreach instead of for
Merge pull request #16 from Naosyth/cleanup

Cleanup