change variables to camel case format, minor code/variable renaming/refa...

...ctoring