Clean up and rename and add me