reformat code

Intendation and optimization of import

Change-Id: Ifa1674425a6ac28f3b035899aa8a5e6b0a383026