notes and small cleanup