Little refactoring
Started work on ProgrammeMessenger plugin