rmoved some comments and updated some docstrings