Made title more modularized