Fixed edits so line-width stays under 80 characters