Some style edits and other