Quick small fixes
Merge pull request #86 from BurntPizza/refactor

Quick small fixes