Cleaned and compacted code, changed names
Changed templating language from .ejs to .jade