Move column parsing into a helper class