Slight cleanup and continuation of association