Clean up work on updating and giving proper credits for used code.