Cleaned up some things