More code formatting.
More performance improvements.