slight cleanups and arrangements
slight templates adjust