Fix space encoding issue

* Fixed space encoding
* Removed unnecessary returns
* Removed overridden duplicate of 'messages' method