Refactoring: making some fragments easier to read