refactored code according to code review; did all changes except
video->specified album