SFM cleanup, part 1

Changing style and removing some generalizations not necessary for MVE.