simplify some stuff