Small adjust for Simplifying code