Fixes trendwerk/trendpress#144
Fixes trendwerk/trendpress#132
Code consistency improvements
Some more code consistency