more cleaning.

re organization