Complete clean up and documentation