getting rid of usless conditional