Refactoring Updates, more to come.