minor changes for readability