correct errant ( and neaten logic