refactor commonalities to commonality