CLUB-581, cosmetics and fixes
CLUB-581, cosmetic fixes pt2
Merge pull request #682 from onepercentclub/feature/CLUB-581

CLUB-581, cosmetics and fixes