Trimming some more fat #38
Merge conflict