consistent naming
more commenting