added albums to file info and made code a little more dry