Minor refactoring.
Merge branch 'master' of https://github.com/robdashnash/PhotoCollector