CheckStyle fixes and code formatting.