some refactoring
back at green
delete commented code
some cleaning up