Refactor clean a bit.