Improve naming and documentation