Remove Run(params string[]) possbility + other refactoring