Clean-up, more comments