Refactor on MainVision