Move to single assert SMS check
Move to single assert SMS check
Move to consitent metric function style