* Removed redunand comment.
* Refactor.