Cleaning up, adding more accurate status codes for responses.