Code refactoring

Change-Id: I053ab0c691295b81dc7aa0fd858fd609a69ade81
1 file changed