Just some comments and docstrings added