Variable names adjustments

Removed:
* county number reference
* stupid f_ reference for county