minor changes for readability/style