Update comment, variable names

Based on review feedback by lrytz.