Vision: Refactor to improve beauty coefficient