Clean Up

Cleaned up code some.