A little more sms refactoring