Readability and maintainability based on review comments. Bug 1309207