[Bug 459793] Refactor