Simplify some stuff