changed; tidyed helpers