Refactor commonality