Many functional unimportant code style fixes (part 2)