edits: minor, function names