styling
merge fixes