Remove commented code. Fix docstring