Continued to remove vector dependence for ease of readibility and reduce the number or required functions