some cleanup, fix the output