(notes and micro-cleanup)