Optimize imports

Change-Id: I80016bf4bbf964641bbb1d89fad33a4e748445d0
Cleanup and added docs

Change-Id: I83b674a61eef0a085735abc90eb3fc80382a0102