Eclipse and code cleanup