removed code formatting in titles
minor refactorings