More source code formatting