Removed unnecessary tests for empty on the iterator being passed at instantiation time (#1082)
Import cleanup
Made constructors private