some clean ups and renames