Cleaned Up

Cleaned up some code