removed trailing whitespace and fixed fetches