Refactor and photo credits