Small changes for clarity