EJS templating replaced with Jade
Refactoring