checkstyle added, removed warnings