Checkstyle fixes

 - Some missing finals
 - Some preexisting checkstyle violations fixed