Cleaning up variable names and messages.