Refator to clean up.