partial edits, shortened some things