Removed all count variables that could be replaced with vector.size() instead, closes #134.