clean up after comments from @rdiomar