Bug 1054405 - refactoring and rewording