Refactored fn naming