Fixed some stuff for checkstyle