Some suggestions for readability