Remove trailing whitespace
Add success flag to collection