Refactoring

title.