cleanup, mainly renaming stuff