I don't need anything super fancy, but some scope aware refactoring would be nice.Refactoring some