clean up code, clean up tests