cleaned up names