Fix: virtual functions were hidden by derived class
Code style fixes