minor fix/simplify