Some changes for readability