Little refactor
merge fix