Code formatting
Checkstyle fixes