templating cleanup/mess up?