clean up.

refactored