No Javadocs for variables.
Checkstyle rule for final class and methods is abandoned since mockito cannot mock final classes or methods.
Simple changes to comply with some checkstyle rules.