Fix comments; reorder methods in Component.php

No functional changes

Change-Id: I8a24b6c7884d747ea38269813cf30c28defe8613