General cleanup, looking better!