removing extra conditional
fixing submitted message sent in an incorrect format