Feature/club 585

Why the extra linebreaks?