small changes/ cleanup