Cleanup template some more