Clarify code and fix warning.