clean up operation and code