Small improvements in presentation