Refactor the boundaries of the Cli and ExtractMethod classes