Clean Code + Update doc