Clean Up

Making it clean