Improved docs and code style

Change-Id: I88ffa78f02b6926cd3c26c364187f6e2c51b24f3