Misc refactoring
Misc refactoring

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