Fixing docstrings and conditional