Improve Eclipse code formatting