updated and fixed checkstyle