Remove TODO comment; Tidying up some more