Refactor to remove unnecessary chaining