Refactor it liveing