Fix method reference
A few code tweaks