More work on prettification