Refactoring for Stylus