Clean up code, runs in 3.5s
started looking at it