Removed checkstyle bugs