code commenting/reviewing, renaming for better readability part 1

Not fully tested!