suggestion resolved - remove unnecessary comments and break line on IFs statements