Tidied up the templates; using 2 space indents on templates