Changed template types to depend on lira types.
Changed tabs to spaces.