Fix White spaces