tweak names
cleanup