Refactor - Remove unused alias
Add if conditional (do not like this implementation)
Refactor - conditional