Working on cleaning up templates