Move to parameterized logging statements