Tidied the code.