some cleanup and renames