Simplify the battle math around vectors

See title