code cleanup changed hashset to linkedhashet