template cleanup, looking good now