Tidied up some of the code from this sprint.