Little code cleanup. Improved passing of additional parameters having whitespaces.