clean up

general clean up