Refactor visual