UPDATED Q00022 && Q00023

white spaces, blanc lines deleted