Tidied up templates even more. Lovin it