Code tidy up in Http_Status dir