refactor to make it more friendly for viewing in only github