Minor Changes

Cleaned up some code and some other stuff