Removing the use of optional in findSet