SFM: Style fixes, cleaning of return arguments