Visual refactoring

Initial version