Minor changes for simplicity