minor reorganizing, nothing added