Replace deprecated inheritance syntax
Code cleanup