lot of cleanup
one step further