Cleaned up using checkstyle settings.