Small code stylistic edits