- Fix return types
- Use "self" instead of copying the type name