Cleaned some code, checkstyle, and revisions from code review