Code refactoring and docstrings
And disabled log messages