Made some variables local
Removed unnecessary if statements
Changed visibility on many public methods
Made some instance variables final
Removed unused method
Removed unnecessary throws declarations
Added some missing comments
Fixed 'pointless numeric expressions' (?)
Removed unnecessary condition in if statement
Removed unused local variable
More cleaning up..
Fixed spelling, formatted code (eclipse) and optimized imports
Merge with 'dev'