Some cleanup and changing _s to camel casing.