Minor code claen up and message pimp up