Improve code formatting and readability