nieuw cleanup submitted by BIERag
cosmetic changes
Merge pull request #87 from JoSchaap/#NewCleanup

github derping out