Velocity cap
Cleanup my code