Code cleanup

Merged extended classes