Clean up
Run Eclipse Code Clean Up Tool