Refactor, extract files
Refactor DisplayMessage
Merge pull request #55 from jho406/develop/jh-extract-files

Develop/jh extract files