simplify a bit
simplify a bit more