minor cleanup and notes