Adjust code to encapsulate laziness a little better