Visual refactor done and working