remove more of them white spaces...