Refactoring of classes
Code cleanup and docstrings