Applying checkstyle changes for code cleanliness