Feature code refactoring