Code clean up for checkstyles.