notes to myself, minor cleanup