Refactor to make things easier for deliery