Refactor so key Vectors variable names are in CAPS
Makes it a bit easier to read/understand, since you can't make variable names bold.