Checkstyle / cleanup