Add general success handling for codes < 400, tidy up for reasability.