Modular code and title improvement