Shawn refactoring