Add logging per code review feedback.
Fix missing final keyword per code review.