simplify few things