Tidied the estimates controller a little