Fixed broken else if clause. Restored comments