cleanup, combine lines 51 and 52