Refactoring, beautification and removal of debug
Refactoring, beautification and removal of debug

stanislavb/roleOOC,yxeri/roleOOC,yxeri/roleTerminal,yxeri/roleTerminal,yxeri/roleOOC,yxeri/roleTerminal,stanislavb/roleOOC,yxeri/roleOOC