Reorganises some code / manages some comments