changed to Jade engine
cleanup