Cleaned up Eclipse code