renamed, clean up, all variations in one file