Tidied up comments etc.