Eh, I guess its a little better...
Move the clean variables to appropriate location.
TEST_LIB var needs to go with unit tests.
Remove leftover base variables.