Messages change
Minor code clean up