Correct mains style problems
Push commits to the source branch or add previously merged commits to review them.