Cleaned up things a bit more.