checkstyle fixes and copyrights