Clean up some unecessary lines of code

Rewrote the initialization of two vectors, which caused a bug in certain
scenarios.