Improved documentation and consistency