Improved error text.
Refactoring and improving code base.
Refactor and improve code base.