Go2o: Small refactoring. WIP