little template clean up
more modular approach