Tidied up the stuff.