Code cleaning up
Doc update