KRACOEUS-7343
KRACOEUS-7343: cleanup sloppy code
Merge pull request #475 from leoherbie/KRACOEUS-7343

Kracoeus 7343