Improve output slightly