Docs update and code clean up