Tidied up the Angular stuff