start fixing checkstyle