misc refactoring of previous commit
misc refactoring of previous commit

isaacs/stylus,stylus/stylus,angryrobot/stylus,SimenB/stylus,tyv/stylus,jangarcia/stylus,meteor/stylus,silvaemota/stylus,Ricardh522/stylus,a-x-/stylus,yetone/stylus,Delapouite/stylus,behzad88/stylus,trixter5/stylus,galenvagen/stylus,rstacruz/stylus,Panya/stylus,peterkinalex/stylus-1,jonpacker/stylus,ThiagoGarciaAlves/stylus,modulexcite/stylus,PeterWangPo/stylus,cemoulto/stylus,darwin/stylus,jameswomack/stylus,johnnycopperstone/stylus,HossainKhademian/Stylus,baotingfang/stylus,Zagorakiss/stylus