minor changes to improve consistency