(ms) started refactoring and tidying a bit the omnet code