Refactoring of Magic String

Refactor magic string
More Refactoring of Magic String

Refactor two more magic string and rearrange the messages. Changes is
made to remove first word due to a previous unseen error