minor syntax edits and removal of comments