Clean-up and comments