styling
more styling
merge fixes