Refactor, clean up.