improving optimizer; renames