Better readability, removed unused relations names