[misc] Simplify the Velocity code