Code tidy (removed abort statement)