Changed message output to codes instead of messages