Added metadata jade template
Refactored to improve naming