changed some expression to make a better reading