(cleanup) clearer function names
(cleanup) clearer var names