add support to solo - refactoring and indentation