cleanup
initial version working