Fixed Errors

Fixed errors and removed unnecessary import.