Another attempt at code formatting.