small album parser refactor