Cleaned up the extension code a bit.