Removed unnecessary constructors,organize imports