Bersek refactoring