Small changes for readibility