some edits/shortening