minor cleanup, fix output