Some trailing spaces fixes ...