cleaning code/adjustments