General cleanup. Tests passing.