Formating and checkstyle violations cleanup.