Refactor + Removed eclipse.