Fixed some checkstyle warnings

Got tired of some checkstyle warnings...