Refactor
Doc update