tidied up the controllers some for josh