re-factoring some keynodes