Cleanup and adjust to add table note