* Cleaned up some code