Made var name and implementation more explicit