Started to add pretty printing of syntax again - ugly