Improved documentation and naming convention