Refactoring to include external functions through double colon