Return of the Vector (at least temporarily)
Another code cleanup
Code Cleanup