album: Refactor code to be much simpler