Cleaned things up more.