Motivation: Saw some code-inspection warnings Modifications: Fix warnings Result: Less code-inspection warnings