edits to make things a bit more concise