Bugs & Fixes Typo

* remove deprecated call to be PHP 5.5 compatible.
* remove trailing spaces.