Start imposing a bit of consistency among functions