Reformatted and made global variables static final.
Merge remote-tracking branch 'origin/master'