Cleaned up a few stuff.