Improved the code formatting