Leaf refactor

SLF4J style interpolation here too please :)