Fixed trailing spaces issues