Applied most of Ryan's suggestions to the vectorization edits.