did some fixes for file indententation and fixed the triming space