Small form edits; mainly astethics