syntax/variable changes up to step 2 part 2
syntax/variable cleanup finished up to part 2