finished editing for style and conventions