Minor code clean up

While going through the javadocs, I notice a few minor issues, like a few fields that could be made final, and also some code formatting that does not look very nice after we formatted the code base a while back.