refactor for readabilty, data pushed into project