clean up and slight renaming