ticket:5 Mini-cleanup