cleaning code / renaming variables