Cleaning up the autoformatting changes done by Eclipse