Removed some unused files, added comments to the template and changed
some variable names