Basic style fixes