code cosmetic & issue 33 - 37