Better names, some docs