Removed debugging and organized imports