Many functional unimportant code style fixes