Making template codes more intuitive per feedback.