Clean-up, comments