Minor styling
Annoying merge