Made further edits based on comments from @gdevenyi