Removed unnecessary variables. Organized imports.