Clean Up imagery and code