Eclipse recommended improvements