Refactorisation and cleanup of orderable concept.