Added different format template
clean-up