simplifying code
simplifying code