style improvements and edits