Inheritance. Code cleanup 2.