Added normalize and normalize open type
split out partials