Tidied up Raven API
Move sort to settings.