a few minor changes for consistency