Improved docs and names for clarity