removed unnecessary if statement and unwanted comment