A little sms cuke refactoring