minor changes for consistency