Reformat code, start to grab albums