Cleaning up the message base to prevent programmer error and to simplify future development