Miscellaneous small style edits