Lots of style work
Fix conflicts