minor cleanup
fix bug in super() call