Fixed some checkstyle violations
18 files changed