Minor code refactoring and cleanup in MessageBuilder; SingleBodyBuilder to use BodyFactory to instantiate TextBody and BinaryBody