cleanup, tiny adjustments