Indentation.
Some progress on refactoring sfm.