Cleaned up checkstyle errors