Use LazyStatement everywhere
Some more cleaning