minor spacing and naming edits