Added Plugin prefix Changed messages. Code cleanup.