Coding style edits