Is your feature request related to a problem? Please describe.
The code has a high number of nested blocks. This compromises both the readability of the code and the effectiveness of the dynamic analysis tools (as likely the compiler). This is the result of pushing for a single exit in methods (which is likely an academic heritage). Relaxing on that front would allow to more linear and readable methods.

Describe why the feature or enhancement you are proposing fits the library.
Go through all classes in the code and linearize as needed. Record classes while they are done.

Describe the solution you'd like
Classes have all been skimmed and are linearized.

Describe alternatives you've considered
Leaving code as is. Given the limited amount of time maintainer can spend on the code, it is viable to optimize their time by reducing their effort in reading the code.