Photoalbum/polish

Code clean-up and refactoring