Mainly style fixes and minor changes