Some minor refactoring
Merge branch 'master' of https://github.com/jeslopalo/springbox-status-messages