Clean Up

cleaning this up a little more.