cleanup/moving more mode code
start moving feature style parsing into modes