Docs update
Code cleanup