Improve code formatting