polish template CLI handling/output