cleaned up templates