tidy code and fix speed