Fixed some Checkstyle warnings