clean up
speed it up a lot