Streamline refactoring