Issue 80 jade cleanup

Merging into master