Moved alias to own function
Refactored for tests