Fix album code, refactor code