Readability improvements, docs