Clean-Up

Cleaned up some code