Further fixed some of the checkstyle problems.