Code cleanup. Minor restructuring. Updated regex for matching video id.