Eclipse's "Clean Up" and my tiny cleanup