Refactor OneUpPatioBlock