Finalize hierarchy
Bye bye dirty class variables