Better management of parametrized types. Code clean up.