Fix indents, spaces and imports

Change-Id: Iea076bfc64e44d0e12436552f2c6fa1fb5ad8559