Refactor for lazy

80f4eeb