Make template cleaner