Fixed feature construction to be in friendlier format.