Little tidy up and all tests passing