Style improvement.
Make some code more readable.
More style improvements.