A few changes for readability