Clean up and style edits