cleanup, renaming varialbles