Fix & Clean Up