misc refactoring
misc refactoring

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