clean up code and requestMessage