cleanup refact