further code simplifying