Refactor - Remove intermediary let