refactor: cleanup names and add doc strings
4 files changed