Cleanup
Prepare for switch to jade from ejs