Updated tab spacing and cleaned up imports