refactor make; use symbols as key