Slightly more readable
Almost done documentation