Refactoring to use dash