Used extensionizr stuff to clean it up.