Tidied up the commented-out sections