Minor.
Templates usage removed
Some code tidy up