SFM: Improved output and coding style