Fix error message.
Refactoring all.
Improve.