Clean up doc strings and remove extra log statements.