Comments formatting
Fix
More cleanup
indentation problem
Sneaky ones
Merge pull request #555 from owdqa/feature/xmas_gift

Feature/xmas gift