* Removed macro difinition from the source file.
* Refactor