Remove warning
Improve output