Increase documentation and readability