Minor code changes for readability