experiment reducing set creation
unnecessary variable removed
FindBugs fixes