Starting the refactoring of local declarations and assignemnts