address comments: better naming.