-Cleaned up some code from merging