Fix typo
Cleanup
Adapt to base class changes and improves self auto completion (get rid of ', ')