Uh...cleaned up ugly stuff.