Improved inline documentation