DF Fixed some checkstyle problems.