Simplifies code and gets at least jade working