Code style edits/fixes