Refactor to fix compiler errors