Cleanup, checkstyle...