removed unnecessary if statement and organized imports