Code style edits/fixes
Code style edits/fixes