removing hard coded string

* Removed some hard coded string.
* Corrected the alignment of the equality. 
* Improving global portability