Source clean up and formatting by Eclipse