Tidy a bit the returns