Cleaned up cities form markup