A tiny bit of refactoring with titles
Rebuild