More of refactor