cleaning up

still cleaning