Jade-ification, general cleanup.