address @octo and @rubenk's comments