Cleaned up a bit. Almost done.