Final checkstyle compliance corrections