Refactor all features