Docstring and log-messsage clean-up