Fixed titles.
Tidy modules/