Clean-up and commenting