Refactor: improved naming and named an anonymous helper