refactored some default templates