Cleaned up a couple things