Refactorings to make code easier to navigate

Change-Id: I322e776b1fd948e38c609930ae5eb04213d5032f
1 file changed