speakers photos refactoring