Merge "Improve Eclipse code formatting"