refactor and clean up.
refactor and clean up.