simplify and improve readability