cleanup, reducing number of explicit template args