Code cleanup

Ran some static analysis on the lint code and fixed
various issues - some typos, made some fields final, made
some methods static, sorted modifier order etc.

Change-Id: Ibdcdec5745f040eb7b0880cf6999c0f0ea7f7e6f