fix value logic, naming and comments