minor edits removing braces etc.