Let the Eclipse Cleanup do it's work on that code...