Cleaned up comments, variable names and declarations
Renamed old.handlebars