removed extraneous conditional