apply PEP8 coding style #2: also change templates which are affected