misc refactoring
misc refactoring

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