Fix indentation and add short option 't' for template