some suggested changes to improve consistency