misc refactoring
misc refactoring

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