minor setting adjustments/cleanup

clean up code