Moving messages out of code