Clean up and adding notes