Refactor Konkordans @ adk14