simplifying code changes from previous commit