Some minor adjustments to clean up some previous merge / adjustment artifacts
Are you sure you want to continue?