Small changes for readability