Improve code formatting slightly