some adjustments cleanups