Refactor: Eliminated f helper