Minor edits/simplification