minor update: updated templates for better readability