general cleanup and renaming