clean up refactors