simplify stuffs a bit