refactor clean up