checkstyle fixes, code cleanup ...