Fix longwinded returns