Implemented design pattern - Bridge + very small refactorings