Source code layout improvement only.