Clean-up & documentation