Refactor to a simpler path