changed templates according to code review