Fixes #29
Clean whitespace, refactor photo constructors