some code formatting fixes
review changes