Mob 1543 refactoring