Refactor EJS
Clear code. Again