Relsib code refactoring