Use better names for things
Also document a few potential gotchas