cleaning up code
started adding variables