cleaned up albumStore code