Little changes for readability