Follow standards as per original

Pattern for log message
Behaviour of parameters