Tidied up the controllers file