Solved #75

Solved issue #75 
I am worried that the use of the method references here is a little too abstract/clever. Can you replace with direct method calls?