.
* Cleanup
* Changed order of concatnation