Make speedy, clean up code