further cleanup

use assoc