Made use of set_return_message standard througout the code