Removed some checkstyle errors