Refactoring and markets view