Remove unused variable.
Move default message logic where it belongs.
Inline method.