Better documentation and naming