Tidied up, useful comments removed