Improved sprinting and cleaned up code