Improved code formatting 2