Typo fix
Improved, simplified extensions