fix nits: break some long lines, correctly use 'a' prefix for all function arguments