Restructured nonbonded calculation to allow more efficient vectorization