Slight code cleanup and adds notes for the future