Clean up, plus davidxli's fix in Line 425.

Change-Id: I899156bafa365a870af324c6f93beac8ebe6f849
1 file changed