Refactoring + added client logos