Adding laziness and cleaning up.