Tidied up commenting