Misplaced return, how was this running
Tidy up