Clean up & Fix