diff working
clean up a little