Cleaned up extension loader a little bit