Refactor the code and documentation...