[CLEANUP] Checkstyle and formatting