much clean up. very code.