Format as per checkstyle guidelines
Fix checkstyle violations