Fixed some checkstyle errors
Merge branch 'checkstyle'