Worked on a few refactoring cases