Replace tabulation with spaces and text formating optimaze

Signed-off-by: Angel Hitov <ahitov@mm-sol.com>